Refactor before starting new systems