cleaned up tabs over spaces and universal standards of calling certain methods