Took care of some formatting, but still need a look from @novohispano