Revision after advice

Got advice from RabidTech's Rob and Mermop.