#9: fixed some lint issues.