Code maintanance and clean up.