More syntax cleanup, still nead a life