Added bishop class
Minor refactorings