Changes and Cleanup

Cleans up code, and gets rid of unnecessary and unused notify.php.

Removes unnecessary closing php tags in some places