Added reek
More refactoring
apperently .nil is bad