Code, readme cleanup