Slight code clean-up and perfection