clarifications and removing some extra stuff