Cleaned up the init a little.