Feature #212: cleanup, formatting