Make the code a little less long-winded
A big step towards unbreaking the Activity Palette