cleaned up code, and improved future-readiness
just setup stuff