(#16) Fix some lint issues.