Removing implementation-specific site name and details.
Small comments and cleanup