Clean code + add comments