Improved - statement formatting