Just making it a tad cleaner