cleaned up code in Work section and config file