fixes function internal comments and removes test constructor