Code cleanup, changelog updated