Fix style violations and specs