Added cleanArgs method to Definition