Make task completable in frontend
Clean up a bit