Cleaned up the paperwork