Issues fixed, now for some formatting