Cleaner way of doing things