more styling fixes and cleanup