Issue #248 Fixing some errors
Issue #248 Removing lines and fixing identations