cleanup

improved, removed annotations, timed