clean some code; add another aspect, "logging"