Tweaks + fixed formatting