Style improvements as requested