Cleaned up code, removed Netbeans pre generated comments.