Cleaned up some code and improved kits