Update and code cleanup

good to here