Refactor a bit Semicolon cop