beautified some things...