Code Cleanup & Fix for strange Form Builder issue