Refactored solution & started with naming conventions