made changes to remove excess data
Refactor to simplify