Removed legend from fieldsets and code cleanup