Fixed hardcoded true, fix code styling