Implementing changes as requested by Tim
Cleanup