Refactor the rkhunter module