Reschuffle activity-xxx.js syntax for the better