More Code Cleaning

Cleaned up multiple methods for your reading enjoyment!