Cleaned up a tad