Modified coding style as discussed.