Cleaned up Building.java