Cleaned up bank engine