*sigh* Cleaned up code