code formatting
more code cleanup