Code comments + cleanup following last commit