Improved code and stuff