Cleaned up Code for Presentation