Simplifying Code
Adding messages