Improved styles and removed some unused functions