Files organized, styles alphabetized, unnecessary comments removed