Refactor, rstrip unnecessary