[RPG] Basic house keeping and code keep up