Fixing up Code