Refactored to make the code easier to read
String now conforms to the build