trimming output spaces
Refactor Rename