Some coding style issues fixeds