clean whitespaces and add comments