Organized code much better