Tidied up - rdy for module section