Refactoring! --> Bug Fixes