Style improvements and a tiny tiny refactor