Fixed some formatting, added generalUtils