Cleaned up code in some spots