General formating fixes