Cleaned fit
Minor refactoring