Rearranged Methods & solved deep duplication issue