Minor Update

Clean up and fixed imports...