adding unicode support for return and cleaning up imports and spaces