Improved code consistency and removed some unused code.