Random changes. Trying to clean things up.