Clean up a little bit and prepare for new functionalities in the future.