source formatting, little cleaning of unused values, comments