long overdue whitespace cleanup