removed spacing and comments