(Not very) Strict code lint check and some minor issues fixed