Basic code style cleanup