Bit more styling and code cleanup