Manish | Cleaning up by removing commented code and extracting out methods.