Code review changes

Might be broken - testing time!