beautifying and cleanup