F - Capitalization & Indentin

Fixed capitalization on the the original classes and fixed some
indenting