finished up and cleaned up