Cleaned Up Code

Cleaned up the source code.