Cleanups

finished changes as described in feature #23