@mattbasta Here is some cleanup :P