Implement l4mRh4X0r's suggested improvements.