Refactor Fixes