Code Cleanup

Fixed issues flagged by html5 validator