Remove excess spaces
Rename methods to avoid having the same erasure as the deprecated
methods