Cleaned up building placement code