Comments moved to h files