fix style applying, containment
add Javadoc