fixed spacing, and removed unused methods