Cleaned up source code
Cleaned up source code