Changed code style for STools