Got a all tests passing and corrected some formatting issues.