neaten code and add dice commands