Cleaned up a lot to prepare for a fork