Cleanup (minor stuff..tabs->spaces for example)