diff --git a/recipes/dot_net.recipe b/recipes/dot_net.recipe
index 50db71e9be..d3a96ad0c3 100644
--- a/recipes/dot_net.recipe
+++ b/recipes/dot_net.recipe
@@ -1,32 +1,37 @@
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
 from calibre.web.feeds.news import BasicNewsRecipe
 import re
 
-class NetMagazineRecipe (BasicNewsRecipe):
-   __author__ = u'Marc Busqué <marc@lamarciana.com>'
-   __url__ = 'http://www.lamarciana.com'
-   __version__ = '1.0'
-   __license__   = 'GPL v3'
-   __copyright__ = u'2012, Marc Busqué <marc@lamarciana.com>'
-   title = u'.net magazine'
-   description = u'net is the world’s best-selling magazine for web designers and developers, featuring tutorials from leading agencies, interviews with the web’s biggest names, and agenda-setting features on the hottest issues affecting the internet today.'
-   language = 'en'
-   tags = 'web development, software'
-   oldest_article = 7
-   remove_empty_feeds = True
-   no_stylesheets = True
-   cover_url = u'http://media.netmagazine.futurecdn.net/sites/all/themes/netmag/logo.png'
-   keep_only_tags = [
-         dict(name='article', attrs={'class': re.compile('^node.*$', re.IGNORECASE)})
-         ]
-   remove_tags = [
-         dict(name='span', attrs={'class': 'comment-count'}),
-         dict(name='div', attrs={'class': 'item-list share-links'}),
-         dict(name='footer'),
-         ]
-   remove_attributes = ['border', 'cellspacing', 'align', 'cellpadding', 'colspan', 'valign', 'vspace', 'hspace', 'alt', 'width', 'height', 'style']
-   extra_css = 'img {max-width: 100%; display: block; margin: auto;} .captioned-image div {text-align: center; font-style: italic;}'
+class dotnetMagazine (BasicNewsRecipe):
+    __author__ = u'Bonni Salles'
+    __version__ = '1.0'
+    __license__   = 'GPL v3'
+    __copyright__ = u'2013, Bonni Salles'
+    title                 = '.net magazine'
+    oldest_article        = 7
+    no_stylesheets        = True
+    encoding              = 'utf8'
+    use_embedded_content  = False
+    language              = 'en'
+    remove_empty_feeds    = True
+    extra_css             = ' body{font-family: Arial,Helvetica,sans-serif } img{margin-bottom: 0.4em} '
+    cover_url = u'http://media.netmagazine.futurecdn.net/sites/all/themes/netmag/logo.png'
+
+    remove_tags_after = dict(name='footer', id=lambda x:not x)
+    remove_tags_before = dict(name='header', id=lambda x:not x)
+
+    remove_tags = [
+         dict(name='div', attrs={'class': 'item-list'}),
+         dict(name='h4', attrs={'class': 'std-hdr'}),
+         dict(name='div', attrs={'class': 'item-list share-links'}), #removes share links
+         dict(name=['script', 'noscript']),
+         dict(name='div', attrs={'id': 'comments-form'}), #comment these out if you want the comments to show
+         dict(name='div', attrs={'id': re.compile('advertorial_block_($|| )')}),
+         dict(name='div', attrs={'id': 'right-col'}),
+         dict(name='div', attrs={'id': 'comments'}), #comment these out if you want the comments to show
+         dict(name='div', attrs={'class': 'item-list related-content'}),
 
-   feeds = [
-         (u'.net', u'http://feeds.feedburner.com/net/topstories'),
          ]
+
+    feeds = [
+               (u'net', u'http://feeds.feedburner.com/net/topstories')
+            ]