Add comments and changes names to something useful