Better Names and Code Improve

KBC code can still be improved a lot