Fix Warnings

Fix warnings and supr of useless commentary