Clean up functions to make them work with bash, add src shortcut