Const correction and moving Simpler class.