Second commit

Cleaned up the code a little.