Refactor - Fixes