Hope this looks cleaner