Coding styles improvements