Base 1.5.5.1 commit

Whitespace should all be standardized