Clean up of various items, also added comments