replaced redundant decorator