Just some beautification