Master

This PR includes just some minor cleanups that should not have any impact on the functionality