Methods for format added

And possibly fixed some angry red lines