Code Cleanup

Just cleaned up the code so it is more readable.