Cleaning up details