Made some lint changes. Will be doing more work soon.