StormTrooper Code cleanup