Cleaned up the last review comments