Code clean up as per style guidelines