Correction & cleanup, cheers @ninjalulz