reindent, some docblock added