Small style improvements
WIP