Refactored Room Cell

Made variables so that it was easier to read