Cleaned up for presentation
Re-orderd code
Updated for presentation