updated readme, code cleanup