Added some polish