Refactor partial implementation
Fix inconsistency in whitespace usage
Correct name of unit test