Organized code
Cleaned up code