loader: whitespace and cleaning