Fixed formatting, initial fork commit

Fixed some formatting, refactored names, refactored utilities to
utilities class