more whitespace and code formatting