change url for api-call, outsource cleanup method in a own method, comments, javadoc