[#21] More code cleanup and code commentary