Refactored Code Structured & added multiple data structures