code cleanup / formatting
close #3