more styling and reversion from an attempt to pre-compile