Making code shorter+cleaner 3