Cleaned up source

Cleaned up source