Styling: some code refactor