Clean code and add todo