Fix spaces, const declarations.