cleaned up changes and styling