#814 Description Builder: Code Cleanup