some cleanup, renaming..