Minor touchups
Memory leaks are an evil thing! (Even if they are fast erradicated by program termination) ;)