Cleanup, tidbits, better and more comments