adjust formatting options
code cleanup