cleanup and added descriptions