Clean code + add comments and reference