Some Capitalization and housekeeping