style rework, clean ups