Cleaned up tasks a bit