a little style
even more style
update/add tests