Clean up imports and added license header