Cleaned up various things in assignment #3