Refactored a method out.
Added a custom formatting file