Cleaned up paths and comments.