syntax cleanup
follow conventions