Lint issues fixed, styling