Remove extra spaces
Add new additional base function