make another pass based on feedback

general cleanup preparing for WGLC