Cleaned up some code :P