more refactoring
Merge branch 'master' of github.com:hw3jung/Gucci