Cleaned up code and added due dates to tasks