Clean up style nits, remove unnecessary method no-op

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>