Greatly improve the method/sub snippets