Clean up

Erased unnecessary commenting
Replaced port configs with equates