formatting, code cleanup