Tweaks and code cleanup - Fa Realz