Code is now more portable and clear.