Beautify the code
Latest build is working fine