More cleanup

Added more attribution and cleanup.