Style tweaks and TODO