code cleanup
be anal
add changelog