Code cleanup. #123