Modifications

- Some more cleanup