some semantical improvements