add base64? and refactoring styles