Second code clean-up and reformatting