cleaning to pass lint and stylechecker