Code Cleanup

Added more comments