small changes, sanitize code
sanatizing code