cleaning up code
cleaning up code
Merge remote-tracking branch 'origin/master'
refactored some code