PRINCE: Hero class clean up