added slug and cleaned up