Add underscore to name and corrected spaces/coding style