Whitespace
Minor rename, comments; added tests