Minor cleanup and added some doc strings