added headers, cleaned up for submission