comment and cleanup
added payment classes