Code cleaned slightly
Code cleaned up