Code cleanup. #40