Code cleaned up
Code reformatted