Fixed up some style and fixed some bad aliases