Cleaned up commented notes...