Correction for spacing and code styling version 2