Improvements to bank import
Bring the code into line with code style guidelines