Code-Cleanup + Added required libraries