Added proper formating to the return list