MASTER: Altered some shorthand PHP, deleted some HTML and moved an ill placed comment.