Chenaged indent to 2 and code cleanup