Cleaned up code and removed semicolons