Improve strict standards