cleanup / code styling