Formatting and added some stuff