Some Building class tidying up/refactoring
Some Building class tidying up/refactoring