stylistic changes. i hope you guys are ok with them