Improvements on style

This commit aims to improve coding style to fit our coding conventions.