More sample beautification.