some whitespace/tab/indent cleanup