fixed indentation and enconding issues