Final commit
Minor code cleanup