Making code shorter+cleaner 2