Fixes & comment removal