Organized some code.