whitespace cleanings
removed some notices