cleanup/code standards