General cleaning up
Some cleaning up