unify usage of comment and description to description
add static imports