TODO comments and actual comments cleaned up