bit of a cleanup
fix