review code, add wartremover