Cleaned up single lined list impl