refactoring

Added a lot of format changes