Improved code modularization, formatted shot chart