Cleaning & Spraying Code

Cleaned up the code.
Spray code finally working.