Improvements/Cleaning up