Refactor & Version Update
