Removed magic strings

And added final String messages