More syntax cleanup, I need a life