misc cleanup of 500px code