Minor updates(non-functional)