Remove unnecessary b64, cleanup & rename vars