fixed some lint suggestions, see #1