Cleaned up tasks more