Further styling and cleanup