Addressed Issues #8 and #10. Cleaned up default attribute processing to remove unnecessary code.