Handle "any" type, refactor

@titanous