code cleanup
removed unneeded code
unified the builder
removing string concat in render loop