fix tabs/spaces, naming conventions