Cleaning code. Not finished.