cleanup / comments
refactored