Cleaned up, updated headers