cleanup/make consistent
6 files changed