Some styles fixes. Code improvements.