Clean up code / comments / logs
merge master and code cleanup