Fix whitespace and remove redundant function calls