Modified by using custom coding style