Refactored HOME variable declarations