Cleanup for Working code