Cleaned up code and started to work on isCheckByDiagonal