Very minor changes. Testing new layout of code