Minor cleanup and refactoring

Add ./run.sh script for ease of use.