Minor on spaces and struct name