Style: Added more coding style conventions and adjusted source to reflect