Finished off MessageHelper.java