Some changes in code-style and format