Updated I/O declarations, made formatting nice