Fix code guideliness issues