code clean-up, styling