Fixed some style-related issues

This commit solve those issues:

http://paste.openstack.org/show/44338/