Code cleanup, using tasks Basics