Clean code, add comments