Implementing clean. Some changes are being made to rename and split.