Add comments
Update main to use new function/class names