Tarted up the rest code a bit