Minor refactor work and correct tab/space formatting.
Disable DriveBC for now since it is redundant.