Refactoring/Inline Temp