Bring code up to standard