cleanup scope, white-spaces and double-quotes