Cleaned up some jank