Code cleanup and 80 characters wide