Fix coding style + enhance readability