Add comments and correct naming