Cleanup and make device-responsive