Code/readability cleanup on sources/tasks directory

Signed-off-by: ziycon <ziycon.eire@gmail.com>