Cleaner code apparently