More code clean up, making the naming more consistent etc.