beautifying and minor improvements