renaming stuff, and removing teh less
prettier now