Fixed more indention in cardpay & bankpay classfiles. Also made some cleanup