Cleaned up code, removed extra lines