Refactorings...
Added ignores...