code refactor fixes rSKed2a0f1dcaeb