cleaned up interface style