Code cleanup

Some more housekeeping. Serving http images from appropriate domain.