Code clean. Prep for thor