Eventually fixed code convention violations