BAMControl: Cleanup and reorder