Reindent and screenshot fixes