Code cleanup.

Removed commented code used for testing.
Commented out unused methods that might be handy to have in the future.
Formatted it all nicely.