Small fixes. Code was beautified
fix