Update comments, Clean up