Refactoring endlines + updating ruleset
New ruleset + refactoring