renaming stuff, styling