Fixed formating
Formating fixes
Added utility functions