Cleaning code up.
Cleaning code up.