[#3] Greg, CHarles and Dj - minor syle changes