Minor styling and dead code removal