cleaned up next/previous