Clean up

Code cleaned up!