Trailing Whitespace
Refactor prime support methods to separate library