Fixes and improvements

Do we add the "<" separately for readability? Cause that is yet another string concatenation, making the operation a bit slower.