code cleanups & formatting