Refactored and uglified svg