Everything is fine here except the removal of constants - fine it isn't used anymore!