Code Cleanup

Cleaned up that code like a polish maid.