Additional comments and code cleanup