Version 1.2 - small changes for readability