bsy refactoring and cleaning up