V1.11 - Optimization, cleanup

- Code optimization
- Minor Cleanup

Signed-off-by: mtaddei2 <mtaddei2@fairfieldschools.org>