added remove space option