added some outline
converted to spaces
some code and style