Organized code better