Code and style fixes
Code fixes
Version 0.7.0