code cleanup + make Base64 a static class