major beautification update