Cleaning up strict issue and code standard from last commit.