refactored code, rake clean, 2 skips