Code formatting, inline docs, method name change