Cleaned grammar, removed collection & map and introduced objects