Base: Minor clean up and comment improvement