Added configurable message, comments and clean up