Some cleaning up in the code

- Some cleaning up in the code