code cleanups and styling