some beautification tweeks