style, mostly. Also fix return case now that we parse everything :)