Cleaned up to prepare for split