Cleaning code up.