Work at Home V 0x0019

Cleaning up Code