styling and coding cleanup