Refactor some, less linesclear