Improvements into code-style