Comply to new betos module. Add comments.