Cleanup, add style