Refactor location of crt