Fix style, remove lint