Fix #9 remove bare returns..