Update and cleanup

Updated comments plus cleanup.