Naming/spacing improvements