Code clean up as per guidelines