Cleaning code up...