Address lint issues (fix #1)