Cleaned up a wee bit