fixed spacing and removed unused fns