[dev]: some tidy up