Cleanup, style formatting