Fixes, Refactor