Finished refactoring cross shaped rooms