organized code better