-- clean comments and typos