Add comments and better naming