Organized some codes