Minor changes and clean-up on the last commit