Cleaned up code and removed comments that aren't needed.