Fixed minor styling issues and some code style