style and organizational changes for sanity