even cleaner code