Giving things better names and a bunch of lint fixes.