Another code reformatting. Hope this will help to maintain the code later!