cleanup of syntax / indentation / blah