rescoped and removed excess code