Code and readme cleanup