Changed tabs to spaces, updated formatting