refactoring site specific code
fixing style