Clean up code;
Update web address in comments