Refactoring - ( Or breaking into multiple files )