Minor cleanup and added some combinators