Minor cleanup with AHK file structure