Refactored commandline input
Updated Pull Request text
Refactored regex for arguments
Encapsulated runtime code