cleaner buildElements handling