cleanup some source code and readme