Code cleanup, method rename for clarity