Some clean and updated doc block