Some clean up in classes headers