Fixed some basic coding style