Clean up method via #396 feedback