moved js and cleaned up whitespace
moved js