Cleaning up code and edge cases
Adding message to params
Adding null description