Code refactor: style following