Aesthetic changes, code clean-up