fixed some style issues
some style fixes + filled one method, couldn't test it (c# and ubuntu -> bad combination)