Tweaks
Comments and cleanup