Improved strings
clean code