some beautification done