Code cleanup for workflow app