Code cleanup, more consistency.