Making code a little cleaner