Organized new code better