Deletes unneeded begin/end
Clean up and additional comments