Fix board performance
Refactoring and code simplification