remove unused attributes
formatting and comments
don't return from blocks