cleaned up code and lint issues