Code cleanup

formatting
renames
code cleanups