Stop testing on 1.8.7
Reduce deprecations
whitespace
Slight refactor