Some coding-style-corrections and warning handlings