Indentation and static

Fix indentation
Remove static status where not needed.