Codecleanup & reworked that it so that it now uses more jQuery