Cleaned up the slugs a bit.