Improved and cleaned some stuff