Cleaned up code except for bank