Make code more consient across files