Added end of files and modal comments