Cleaned up some hacks from today