Featurebox plugin - Code cleanup