tidied up. hoping @prabirshrestha approves :smile: