fixed some of the linting warning;
still need more information before can fix the rest;