cleaned up to do tasks