Resolved most rubucop issues