cleanup/make consistent
19 files changed