quickfix #4
some cleanup