tidy up code and make Rk+a

Signed-off-by: beccawilson <rebecca.c.wilson@gmail.com>