add more liniting and better var names