(feat) Pedometer directive final tweaks and cleanup. Ready for firebase