Refs #55 - Improve readability