cleanup: comments
add: timer