(fix) Refactored comments, names, and spacing

Adjusted project to make it look like one person wrote it