cleanup, formatting, commenting