Extracted clear methods and finishing touches