Cleaned up the code

Just a little bit more cleaning up.