Changes made to make code look cleaner and add a couple TODO statements