started on style-cleanup  #51
closes #51
merged style-cleanup